ScreenShield: ensure we don't leak logind inhibitors

This could happen if we are VT switched away and an animated
activation is requested because we're preparing to enter sleep. Since
we don't animate in this case we'd never reach
_completeLockScreenShown() before coming out of sleep, at which point
we _inhibitSuspend() again and would leak the previous inhibitor.

https://bugzilla.gnome.org/show_bug.cgi?id=749228

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 1cfc211774b6ce5cbafbdb0f09d51d9a4fcce4f2..d50113f88ef9eaabbeafc50fa3594dca094e5f2f 100644 (file)
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -667,6 +667,8 @@ const ScreenShield = new Lang.Class({
     _inhibitSuspend: function() {
         this._loginManager.inhibit(_("GNOME needs to lock the screen"),
                                    Lang.bind(this, function(inhibitor) {
+                                       if (this._inhibitor)
+                                           this._inhibitor.close(null);
                                        this._inhibitor = inhibitor;
                                    }));
     },